[TS migration] Migrate 'withPolicy.js' HOC to TypeScript #29554

blazejkustra · 2023-10-13T12:37:27Z

Details

Migration of 'withPolicy.js' to Typescript.

Fixed Issues

$ #24965
PROPOSAL: N/A

Tests

Verify that no errors appear in the JS console
Verify that Workspace screens work as before (withPolicy is used in multiple components inside workspaces)

Offline tests

N/A

QA Steps

Same as Tests

PR Author Checklist

I linked the correct issue in the ### Fixed Issues section above
I wrote clear testing steps that cover the changes made in this PR
- I added steps for local testing in the Tests section
- I added steps for the expected offline behavior in the Offline steps section
- I added steps for Staging and/or Production testing in the QA steps section
- I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
- I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
I included screenshots or videos for tests on all platforms
I ran the tests on all platforms & verified they passed on:
- Android / native
- Android / Chrome
- iOS / native
- iOS / Safari
- MacOS / Chrome / Safari
- MacOS / Desktop
I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
I followed proper code patterns (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
- I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
  - If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I followed the guidelines as stated in the Review Guidelines
I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
I verified that if a function's arguments changed that all usages have also been updated correctly
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG))
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR author checklist, including those that don't apply to this PR.

Screenshots/Videos

Web

web.mov

Mobile Web - Chrome

a-web.webm

Mobile Web - Safari

i-web.mp4

Desktop

desktop.mov

iOS

ios.mp4

Android

android2.webm

src/pages/workspace/withPolicy.tsx

fabioh8010 · 2023-10-25T12:14:09Z

src/pages/workspace/withPolicy.tsx

    WithPolicy.displayName = `withPolicy(${getComponentDisplayName(WrappedComponent)})`;
-    const withPolicy = React.forwardRef((props, ref) => (


Why did you remove the forwardRef?

According to our guidelines, forwardRef should be used like this:

function CustomTextInput(props: CustomTextInputProps, ref: ForwardedRef<TextInput>) { return ( <View> <TextInput ref={ref} /> {props.children} </View> ); }; export default forwardRef(CustomTextInput);

I just moved it to withOnyx call :D

fabioh8010

LGTM

melvin-bot · 2023-10-25T13:19:39Z

@Ollyws Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

blazejkustra · 2023-10-30T08:53:23Z

@Ollyws I resolved the conflicts. You can work on the reviewer checklist now, thanks! 😄

Ollyws · 2023-10-31T17:55:33Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native

01_Android_Native.mp4

Android: mWeb Chrome

02_Android_Chrome.mp4

iOS: Native

03_iOS_Native.mp4

iOS: mWeb Safari

04_iOS_Safari.mp4

MacOS: Chrome / Safari

05_MacOS_Chrome.mp4

MacOS: Desktop

06_MacOS_Desktop.mp4

Ollyws

LGTM

melvin-bot · 2023-10-31T17:56:55Z

We did not find an internal engineer to review this PR, trying to assign a random engineer to #24965 as well as to this PR... Please reach out for help on Slack if no one gets assigned!

OSBotify · 2023-10-31T18:07:53Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

OSBotify · 2023-10-31T21:58:49Z

🚀 Deployed to staging by https://github.com/joelbettner in version: 1.3.94-0 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	failure ❌
🕸 web 🕸	success ✅

OSBotify · 2023-11-01T08:50:48Z

🚀 Deployed to staging by https://github.com/joelbettner in version: 1.3.94-0 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	failure ❌
🕸 web 🕸	success ✅

OSBotify · 2023-11-02T10:14:10Z

🚀 Deployed to production by https://github.com/Beamanator in version: 1.3.94-2 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

OSBotify · 2023-11-02T10:38:56Z

🚀 Deployed to staging by https://github.com/joelbettner in version: 1.3.95-0 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

OSBotify · 2023-11-06T22:08:59Z

🚀 Deployed to production by https://github.com/puneetlath in version: 1.3.95-9 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

roryabraham · 2024-01-13T01:54:34Z

src/pages/workspace/withPolicy.tsx

-        forwardedRef: PropTypes.func,
+export default function <TProps extends WithPolicyProps, TRef>(WrappedComponent: ComponentType<TProps & RefAttributes<TRef>>): React.ComponentType<Omit<TProps, keyof WithPolicyOnyxProps>> {
+    function WithPolicy(props: TProps, ref: ForwardedRef<TRef>) {
+        const routes = useNavigationState((state) => state.routes || []);


@blazejkustra why did we use useNavigationState here to get the current route instead of just using useRoute?

I reused the logic that was written before, with Typescript migration I usually try to avoid refactoring that could cause regressions, also at the time navigation wasn't migrated yet so I just didn't want to touch it here 😄

const currentRoute = _.last(useNavigationState((state) => state.routes || []));

blazejkustra added 3 commits October 13, 2023 14:36

[TS migration] Migrate 'withPolicy.js' HOC to TypeScript

2cadcf6

Merge branch 'main' into ts/withPolicy

3250739

Add new onyx values

9b074dd

BartoszGrajdek reviewed Oct 19, 2023

View reviewed changes

src/pages/workspace/withPolicy.tsx Outdated Show resolved Hide resolved

src/pages/workspace/withPolicy.tsx Show resolved Hide resolved

src/pages/workspace/withPolicy.tsx Outdated Show resolved Hide resolved

Adjust the code after review

7ae4259

blazejkustra requested review from BartoszGrajdek October 19, 2023 15:36

blazejkustra added 2 commits October 19, 2023 18:45

Fix forwardRef error

7ffe27e

Improve PolicyRoute type

7058006

BartoszGrajdek approved these changes Oct 20, 2023

View reviewed changes

fabioh8010 reviewed Oct 25, 2023

View reviewed changes

Adjust after review

97e36fb

fabioh8010 approved these changes Oct 25, 2023

View reviewed changes

blazejkustra marked this pull request as ready for review October 25, 2023 13:19

blazejkustra requested a review from a team as a code owner October 25, 2023 13:19

melvin-bot bot requested review from Ollyws and removed request for a team October 25, 2023 13:19

blazejkustra added 4 commits October 25, 2023 15:21

Merge branch 'main' into ts/withPolicy

37576ae

Change display name

81b8730

Remove getComponentDisplayName

f5672e0

Merge branch 'main' into ts/withPolicy

d3726c3

Fix imports

2cbc764

Ollyws approved these changes Oct 31, 2023

View reviewed changes

melvin-bot bot requested a review from joelbettner October 31, 2023 17:57

joelbettner approved these changes Oct 31, 2023

View reviewed changes

joelbettner merged commit e661395 into Expensify:main Oct 31, 2023
13 checks passed

OSBotify mentioned this pull request Oct 31, 2023

Deploy Checklist: New Expensify 2023-10-31 #30662

Closed

97 tasks

lanitochka17 mentioned this pull request Nov 1, 2023

[$500] Workspace - Avatar in chat header does not revert to default avatar after deleting workspace #30724

Closed

6 tasks

OSBotify mentioned this pull request Nov 2, 2023

Deploy Checklist: New Expensify 2023-11-02 #30752

Closed

melvin-bot bot mentioned this pull request Nov 2, 2023

[$500] [HOLD for payment 2023-11-09] [TS migration] Migrate 'withPolicy.js' HOC to TypeScript #24965

Closed

roryabraham reviewed Jan 13, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[TS migration] Migrate 'withPolicy.js' HOC to TypeScript #29554

[TS migration] Migrate 'withPolicy.js' HOC to TypeScript #29554

blazejkustra commented Oct 13, 2023 •

edited

Loading

fabioh8010 Oct 25, 2023

blazejkustra Oct 25, 2023 •

edited

Loading

fabioh8010 left a comment

melvin-bot bot commented Oct 25, 2023

blazejkustra commented Oct 30, 2023

Ollyws commented Oct 31, 2023

Ollyws left a comment

melvin-bot bot commented Oct 31, 2023

OSBotify commented Oct 31, 2023

OSBotify commented Oct 31, 2023

OSBotify commented Nov 1, 2023

OSBotify commented Nov 2, 2023

OSBotify commented Nov 2, 2023

OSBotify commented Nov 6, 2023

roryabraham Jan 13, 2024

blazejkustra Jan 14, 2024

		WithPolicy.displayName = `withPolicy(${getComponentDisplayName(WrappedComponent)})`;
		const withPolicy = React.forwardRef((props, ref) => (

[TS migration] Migrate 'withPolicy.js' HOC to TypeScript #29554

[TS migration] Migrate 'withPolicy.js' HOC to TypeScript #29554

Conversation

blazejkustra commented Oct 13, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

fabioh8010 Oct 25, 2023

Choose a reason for hiding this comment

blazejkustra Oct 25, 2023 • edited Loading

Choose a reason for hiding this comment

fabioh8010 left a comment

Choose a reason for hiding this comment

melvin-bot bot commented Oct 25, 2023

blazejkustra commented Oct 30, 2023

Ollyws commented Oct 31, 2023

Reviewer Checklist

Screenshots/Videos

Ollyws left a comment

Choose a reason for hiding this comment

melvin-bot bot commented Oct 31, 2023

OSBotify commented Oct 31, 2023

OSBotify commented Oct 31, 2023

OSBotify commented Nov 1, 2023

OSBotify commented Nov 2, 2023

OSBotify commented Nov 2, 2023

OSBotify commented Nov 6, 2023

roryabraham Jan 13, 2024

Choose a reason for hiding this comment

blazejkustra Jan 14, 2024

Choose a reason for hiding this comment

blazejkustra commented Oct 13, 2023 •

edited

Loading

blazejkustra Oct 25, 2023 •

edited

Loading